From: kaf24@firebug.cl.cam.ac.uk Date: Fri, 14 Apr 2006 13:18:39 +0000 (+0100) Subject: Trivial patch to fix x86_64 builds in which XEN_TARGET_ARCH X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16158^2~2^2~18 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=2256643d06799d4ff0b1f7c5e542cd5af6f7670e;p=xen.git Trivial patch to fix x86_64 builds in which XEN_TARGET_ARCH is specified on the make command line, e.g.: make XEN_TARGET_ARCH=x86_64 This busted the vmxassist and hvmloader builds, which must be done -m32. Using "override" in the vmxassist/hvmloader Makefiles fixes the problem by not allowing this to be overridden from the command line. Signed-off-by: Dave Lively --- diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index c38832fbc5..7d76d8002d 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -21,7 +21,7 @@ # External CFLAGS can do more harm than good. CFLAGS := -XEN_TARGET_ARCH = x86_32 +override XEN_TARGET_ARCH = x86_32 XEN_ROOT = ../../.. include $(XEN_ROOT)/Config.mk diff --git a/tools/firmware/vmxassist/Makefile b/tools/firmware/vmxassist/Makefile index d34d107373..08fea45781 100644 --- a/tools/firmware/vmxassist/Makefile +++ b/tools/firmware/vmxassist/Makefile @@ -21,7 +21,7 @@ # External CFLAGS can do more harm than good. CFLAGS := -XEN_TARGET_ARCH = x86_32 +override XEN_TARGET_ARCH = x86_32 XEN_ROOT = ../../.. include $(XEN_ROOT)/Config.mk